From 089ad5f0894c4888ec859b71050d04db3f500557 Mon Sep 17 00:00:00 2001 From: "tsteven4@gmail.com" Date: Thu, 13 Feb 2014 01:38:00 +0000 Subject: [PATCH] fix bug with case insensitive compares in gpx and garmin. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4733 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/garmin.cc | 2 +- gpsbabel/gpx.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc index 677f1d3ad..d5dd6a297 100644 --- a/gpsbabel/garmin.cc +++ b/gpsbabel/garmin.cc @@ -1314,7 +1314,7 @@ d103_icon_number_from_symbol(const QString& s) } for (i = 0; i < sizeof(d103_icons) / sizeof(d103_icons[0]); i++) { - if (0 == (s.compare(d103_icons[i]), Qt::CaseInsensitive)) { + if (0 == (s.compare(d103_icons[i], Qt::CaseInsensitive))) { return i; } } diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc index d9063be57..a6c830cdd 100644 --- a/gpsbabel/gpx.cc +++ b/gpsbabel/gpx.cc @@ -1140,11 +1140,11 @@ gpx_end(const QString& el) wpt_tmp->fix = (fix_type)(atoi(CSTR(cdatastr)) - 1); } if (wpt_tmp->fix < fix_2d) { - if ((cdatastr.compare("none"), Qt::CaseInsensitive) == 0) { + if ((cdatastr.compare("none", Qt::CaseInsensitive)) == 0) { wpt_tmp->fix = fix_none; - } else if ((cdatastr.compare("dgps"), Qt::CaseInsensitive) == 0) { + } else if ((cdatastr.compare("dgps", Qt::CaseInsensitive)) == 0) { wpt_tmp->fix = fix_dgps; - } else if ((cdatastr.compare("pps"), Qt::CaseInsensitive) == 0) { + } else if ((cdatastr.compare("pps", Qt::CaseInsensitive)) == 0) { wpt_tmp->fix = fix_pps; } else { wpt_tmp->fix = fix_unknown; -- 2.30.2